Trivial: Use g_clear_object more

It no longer has atomic overhead, so we can use it everywhere.

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 1c8e78e56beaf63008fb58f5b20d9fd9f44824b7..05c1bc07aeeb0522632014bdc42c6e0e624125df 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1398,11 +1398,7 @@ gtk_container_destroy (GtkWidget *widget)
   if (priv->restyle_pending)
     priv->restyle_pending = FALSE;
 
-  if (priv->focus_child)
-    {
-      g_object_unref (priv->focus_child);
-      priv->focus_child = NULL;
-    }
+  g_clear_object (&priv->focus_child);
 
   /* do this before walking child widgets, to avoid
    * removing children from focus chain one by one.

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index c0407a94720cbf2bb6844f89a69d9ffe3bcee36d..1fa2958802861e21c30a8b248f9331e20c145f4d 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -12140,8 +12140,7 @@ gtk_widget_finalize (GObject *object)
 
   gtk_grab_remove (widget);
 
-  g_object_unref (priv->style);
-  priv->style = NULL;
+  g_clear_object (&priv->style);
 
   g_free (priv->name);